Minor changes on front end