Various Theme updates

Fixes for various layout issues and template name changes, see the individual commits for the specific details.

Also update for drafts loading (controller and subs)