Added nav and custom views