UI made consistent and also changed the navigation item.