fix front end bugs