layouts revamp + logout