fixed header, changed order and nav naming