WIP Feature/refactor frontend list