Replaced spans with a tags and added more styling