Some more minor cleanup before I forget

Fixed a couple of  theme issues based on discussions at Elk, kind of meaningless since we will not use this theme but meh.   Also some minor things found on my local that I want to get done with.