Furthur GUI refactors.