Surrender button, undo logic fixed, navbar improved