More Android fixes, plus started 'top' panel dev.