css and layout improved/cleaned