Fix layout and Nav issues