Added more specific styles and layout tweaks