half figured out the nav and fixed small stuff