Fixed some positioning problems