Changed tab order and added tooltipps