Assessment17 - Added showing/hiding properly
Assessment9 - Made to look and act closer to the original