Break React components down a bit more