Fixed more issues added status and undo button