Data usage implementation added, UI adaptatios