Fixed auth, layout changes