overhauled clientside to separate displays