refactored andy's changes, adjusted nav sizing