Many changes including working code highlighting

Complete redesign to incorporate code highlighting