Made labels round so they look less like buttons.
Merge branch 'addJinja-ui' into addJinja