Minor amends on front end