Fixed UI bugs in Android CRP