Merged projects and did a major GUI redesign