view refinement and bug fixes