Frontend draft, backend fixes