Second Commit - Improved UI