Fixed input box highlighting issue, will now do full test before removing commented out code