Frontend updates and a few backend fixes