First round of changes

Fixed some formatting issues and layout problems.