Styling Fixes as per steven