Update with original interface and new buttons