ui improvement by charlie