More forum code clean up. Still need to figure out layout/content_for