Navigation moved to layout