Working on #22. Added labels for accessibility, added more spacing