form fill out and layout fixes