Updated template, removed old widgets, now using angular widgets