Fixed buttons and calls to work with the changed UI code.