Fixed accessability bugs