Fixing menu & headers