Restrucutred again to account for screen size changes