Updated view and layout templates