Refactor according to requirement of new website