Form Tab fixes