Change layout menu stuff, fixed crashing when using Up navigation