styling website show
merging with master