Made components sit in the right locations