components optimization
Merge pull request #316 from mkurek/feature/gui-fixes

components optimization