Merged the TableViewRefactored and MediaHandlers Branches. Resolved all
conflicts and visually tested correct functionality remains from
branches.