Some css tweaks and code cleanup