Add more content, and fix some alignment issues