More PEP8 changes, more UI changes.