Merge pull request #5 from Webiny/master

Minor component refactor