pull in frontend changes from Fritz