Problem with client CMS

I’m currently writing a client CMS that will hopefully make it easier for my non-technical clients to edit/add pages/website info without screwing up the design…

My problem is this: The interface features a WYSIWYG editor that in hopes would be the best option for these non-tech clients; no access to code, update save and forget, etc… However, I’m still facing the issue of client uploaded images, support for multiple columns, making use of more dynamic pages like job listings and contact forms and all of the problems associated with letting a client structure the pages on their own…

The problems started building up so much that I just said screw it and decided to start re-writing it.

Anybody wanna help me kick off the brainstorming process? Help me figure out how I could overcome this issue without spending money on commercial CMS software and keep my branding in the CMS etc…?