Refactor to fix movies height issue