Updated path references to stylesheets and script so mockups work
Fixed merge conflict in mockups