some more styling and cleanup of forms