Minor fixes for proper display