Improved formatting

Soon will need to move to individual sections, possibly with descriptions