Fixed #43
Fixed #32
Fixed js includes and other minor issues on secondary pages