Fix ask peter ui issues

Fix #675 and #672