renamed libs and more work for new view mode