Resolved some spacing issues