cleaned up forms
front end upgrads