Very basic form and some visual fixes...