Merge remote-tracking branch 'zawadzki/new-design'