Added fonts, styles and layout
merge fix