Fix styling on root by closing divs
Fix formatting and add comments
Fix merge conflicts