Fixed some accessability issues