removed deprecated highlight class on weeks
refactored code to use models more extensively and improved categories