more consistent navigation between all layouts