Fix comments, move button visibility logic