-fixed expander layout bug

- make expander auto size its grid column/row if needed
Merge remote-tracking branch 'bbnova/master'