Pulled delete form macro from utils; changed location and styling of save/delete buttons