cleaning up backend pages and adding more cms elements to front end in place of placeholders
merge