Apply final design

new design, new content