Rename displaystate manager, fix issues, updates #48