misc changes
Merge Atlas GUI