Made a few minor usability tweaks