Fix css and clean up