Modified height
Add Button
Merge branch 'master' of github.com:MediMark/medimark