Adding hash support and fixing layout issues