Small tweaks to the GUI
Fixing conflicts