Added more user stuff and refactored a lot in admin pages