Fixes some layout and logout route