Cleaning up a bit, fix interactive sizing.