Layout fixes and Nav fixes