Correct showing of AP&CP

Corrected updating of AP & CP display on selection & on action showing