few tweaks to style and api handling