Change layout names, fix logout