More cleanup and adjusting display code

More cleanup and adjusting display code