Fixing margin spacing issues