improvement to ux
Merge branches 'B' and 'B' of https://github.com/zxc1984/shoppingpal into B