fixed frontend and updated join