restructured Android GUI