fixing styles and layout