Added user menu wherever it should be