Tiny design changes