some Bugfixes and Menu Buttons added