Fixed addition of sub condition
Added InputView