Fixed some oddities on smaller devices