Add RemoveButton view and refactor views