Code Cleanup
Fixed a few merge conflict issues that were also missed, even in the last commit!
Also cleaned up some more functions and split the display room ones as well.