Working on the new Public UI