Improved UI, cleaned up code for User