buttons changes; menu tweaked