Fixed spacing issues and russian doll issue