Added all components to GUI (although doesn't look very good as yet)
Merge remote-tracking branch 'origin/master'