fixing views handling