Centering

I centered things up and changed a couple sizes so the UI lines up
better.
merge
Merge branch 'pr/1'