Fix bug where first button is re-selected when redrawing the list.

Also, update to project structure.