cleaning up widgets and adding deep linking!