Minor changes are being pushed before we do a major change in gui structure.