Form layout fixes