Adding some UI and design