Latest changes: better edit mode, reset button, new UI