Initial hand merge of SB dashbaord UI