New Changes to Optic GUI

Changes for Dan Review