UI pretty much done
Merged