Moved Mads' views into the login branch.