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

Should be 16:9: