Removed duplication (DRY) and phone/tablet working.