Redo of layout for better flow.
Changed to remove button on selected view.