Added discard button to forms
Removed collapsed padding