CHANGE: UI improvements. Did some ugly bits, but fit for purpose.