Added switch to stub setting and ui improvements