Layout tweak and allow edit note