Update from MagRocket (master) 1.1 Code and UI Updates

Updated from MagRocket master.