Fixed issues about design