Some fixes in handling parent cases and some visual aids