Removed show column and made some changes in appearance
conflict resolved