Few little display fixes based on testing