Moved user handling to separate controller/views