move around some calls in gui class