Clean up some unused files, moving around controls, adding skip forward back