add border before buttons
Merge branch 'master' of https://github.com/jpmoop/jpmis
fix layout for company and user forms