UI new features, Mocked data, Fix bug