Added remaining screens and fixed bugs with existing ones