General Styling Fixes