Updated Manifest and Layout