Update nav with new Twitter Bootstrap markup. Also include overlooked changes to user from Rick