GUI restructure, add scale