Fixed spacing issues and and list numbers