Work on form, minor structural changes and theme changes