Updated manifest and main layout file