moved things on form, cleaned up styles