Improved UI
Fixed styling