[RFR] Update components & site wording

Also fixes #7 & #8