Lots of work on initial theme layout
Last few tweaks for the evening... starting to get there!