Evened up buttons. Color still needs work.
Merge branch 'addJinja-ui' into addJinja