Fixed the positioning issues.