Fixed btns height and invalid message
Merge branch 'btns-invalid-message'