Changes some GUI to match Marty's recommendations