Added tab control, some menu