Made design changes