updated margins on form and home views
relabeled buttons