Adjusted UI for out stock and fixed an issue for couter creation
Merge branch 'frank' into vopc