Merged new GUI