Improving view & fixing issues