Added new styles and tweaks