Merge pull request #708 from sergeyklay/feature-bootstrap-3

Minor fixes
Fixed issue: Fixed button layout