Updated android layout