clenaup widgets and templates