Updates and bug fixes for small screen devices