Fixes for testtsttstststS
Added menu entries