made some improvements for accessibility/usability... thanks Kalbag ;)