a few modification for better display