Capture fix and Profile Layout upgrade