Added libraries and layout