Cleaned up frontend forms