whitespace correction and usabilty/design tweaks