Design fixes & regards & typo fixes