Refactoring and some imrpovement in web