#354 front end fixes