Fixed some positioning