Updating form layout and starting to add some paint