Refactor to include tile partial