Fixed compile error due to wrong imports

and added VistaMenu back.