Added Make Configuration Tab
Merge remote-tracking branch 'scott/master'
Added AreaHolder and implemented