First attempt of a correct UI