Added some style changes, working on AddType validation