Customization and fix some layout bugs