Lots more changes, fixes for smaller devices.