Some work with a new design
Add missing files