Made some usability tweaks