Final Commit
- small UI tweaks