js frontend fixes