Minor design tweak

Update #45