Added some wgets and removed redundancy