New and probably final design
refactored some content
refactored some content