Fix styling issues
Add sources