refactor and css tweaks