Moved remove button to top