Fixed some formatting issues and size irregularities