Added templates and custom elements to remove updates in app
Added comments
Cleaned up small things
Updated with code review comments
Fixed trailing whitespace and imports