Updated layout. Checks of logged in