improve: Make ux better