Issue #402 - add design and android logic