added categories page, updateed routes, added necessary classes on some views
added categories page, updateed routes, added necessary classes on some views and resolved conflicts