Refactored some CSS / Added some Aria roles