Fixed positioning issues