Fixed styles and bugs