Style impovenments
JQuery independent, other displaying optimizations
Clean up