Cleaned up UI
Added functions for User