Cleaned up some form issues