Updated...
Better UI (still in progress) with dialogs and use of modals