Adding buttons for Import, Queue, Finalise, Add, Edit plus some
refactoring as futile attempt to get some of them working