Update for new GUI design