Fixed some more positioning and so on.