Clean-up and some more positioning