Stylesheets are loaded properly on category pages
Minor cleanup
Some more cleaup