hover effects
intermediate clean up
cleaned up! now with expand/collapse and better controlling