finished queue view, cleaned up models