Small design changes fixes