Massive GUI Update
Merging