Edit Add buttons, Clean up views