ui upheaval and some new bugs to fix