Minor visual changes and improved (next) sd-api