Better UI, thanks @amedeo @vjt