Some improvements on small screen