Optimsed and improved spacing
improved spacing