UI alteration; hopefully v1.1