map added + layout fixes