Performance improvement and new activity layout