Changed buttons a bit
Merge branch 'fixlogin'