views enhancement and some fixes