Position change for the remove option
Merge branch 'issue-41' into develop Closed #41