Update all the templates to extend one common base instead of two. Get the bucket panel working mostly.