Fix css and layout