Fixing old style => hashes
minor visual fixes
Fixed a test and an html related bug