#26 - Controls now resize as well