added maps and fixing layout