Cleaned up code and changed to jquery, re: laf suggestions