Issue #119 - Final android layout