#530 Use header buttons, other imrpovements