Some work on fixing screen size issues