Fixed my own local bug
Merged with master
Part-way through updating UI and cleaning code
Big UI changes
fixed merge nadine kevin