Removed Edit and Moved Continue buttons