Add content, improve the design