fixed up frontend