Added a done button and row locking