Clean up a bit the UI for the buttons
Implement views for adding and editing fields from context pane