Updated Android Layout