Changes to manifest and main layout