Iss99 Implementation

Front End implementation of #99 (and #182 )
Wait for final testing after #184 is deployed on firefly and production