Framework and class efficiency improvements and addition of optional right sidebar