More tidy up.  Removed the scroll function that I haven't yet been able to get to work.