Fixed scrolling issues.
Revert "Removed 'delete' buttons when editing."

This reverts commit 2b60f8cf926bfe328b6820cda85273831fff91f4.
Unused code removal.