css fixes
Reefactored a little