positioning things
Merge branch 'makeup'