Website modifications (refactoring)