Display enhance

Some display enhancements.