Added a couple more UX tweaks before testing next week, however there is a couple of annoying UI bugs I need to focus some time on.