Improved code, spacing and hovers