Organise views + bugfix in login