Final Commit

fixed nav link issues; updated css