Adding Styling and UI changes