Mostly codede clean up, fixed a few JS bugs and fixed the last few accessible templates that were still untouched