Fix up basic/advanced buttons in new screens