Refactored layout to show user logged in