Fixed nav, added some styles, cleaned code
Made a couple changes