Remove separation between contexts and add new button.