Moved website view logic from common to website app