Adds buttons, fixes layouts
Merge branch 'master' of github.com:riminangelica/joborder