Modified the way how the things are showed