Improve nav and layout, remove dev lines