front end fixes
fix merge