Refactored HTML a little and fixed nav styles