some fixes on view