Fix initialization logic and menu spacing