Added mobile and desktop hides, some housekeeping