Display enhancements

1.) Changed display mechanism (separated implementation from presentation)
2.) Added room1000 handling