todos, moved a few views, bugfixed login