Reorganized and css tweaks