improved position of buttons and fields