[IMP] Improve UI, Fix edit record bug