few layout's changes
separate maps file. pubs/subs