Add full support of right menu and redraw callback from controls