Minor fixes and improvements, aligns forms better and removes awkward floats from toggle basket.