wip
Add content and redesign