Fixed some accessibilty issues (still a lot to do)