[Core] Usability tweaks! YAY