Starting to break out into fragment based UI