Almost ready to demo. Fixed a lot of UI