Cleanup.
Templates.
Cleanup menus.
Merge branch 'develop'