update gui to work with new choice stuff, bugs in choosing