Added some more widgets and removed some unused templates