Add video layers, refactor layer controllers to simplify and be more OO.