Fix some Display issues