ui improvement by charlie part