Updated nav and layout a bit