Updates

GUI rework.