Updates for new GUI