added Display class and state manager