Added hovers, improved layout