Command separated to variable, and better dimensions
merged laptop and desktop changes