Bh welcome redesign

merging stuff to master