Refactor video and search screens.