fixing up makefile
Refactoring and web performance optimization