Merge branch '1.1' into icebearPatch
Refactored createUI
Fixed scaling bug
Completed component
Finished component
Merge branch 'icebearPatch' into 1.1