Changed pins around and tidied up screen output