Form layout fix