Minor tweaks to button assignments and file structure.