more modularization

also added nohighlight css