Cleanup for small screens round 1
Move strata calls to strataService