Clean up user permissions and form layout