Navigation fixed, moved to seperate log in page, fixed controller tests