UI cleanup and styling improvements