Tweaks for better accessibility of components, bug ix, code cleaning