Add

~MenuBar
~Viewport
add some definitions