Layouts/Nav cleanup