improved spacing issues