CSS Fixes and improvements