Changes for horizontal form and tooltip placement