Added switch to grid layout