More UI
Merge branch 'master' of github.com:rbuenviaje-mdsol/mpatient
More fixes