Update model, UI + refactor world