Made design improvements