This problem is now solved. At the login screen Ctrl-Alt-F1 which takes you to the login, login as pi and if when you run startx you get this error xauth: timeout in locking authority file /home/pi/.Xauthority type sudo chown -R pi:pi /home/pi and then try startx again. Then set your boot preference...