changed statics
cleaned up content and organized templates