Fix grunt error
fix build error
UI beautifying