Done some rework on the UI. Lot's left to do.