Refactored Liquid Page