Small design adjusts