fix for GCOD-555
fix for GCOD-567
Merge pull request #50 from deniszgonjanin/master

Accessibility issues