Version 2.0 beta 2 changes: added maps, more layout formats