Made some changes to help with accessibility