Merge pull request #1 from Webiny/master

Minor component refactor and few bugs fixed