views customization
fixed merge conflicts