Moved settings into menu