Bug fix General style and layout