Modified some parts of design