fixed problems
changed logout
moved stuff around