Tablet + Desktop fixes