Small customization enhancements and fix

Hi Sacha,
Made some small changes while building my own theme/adaptation...