Just before UI rewamp

Still need to refactor the code to keep functional code out of the UI