Polished & remamed UI file