Made all nav stuff in one cell, and simplified