Add new buttons and correct scrubber positioning