Improve nav layout