Updates for Styling issues