Basvi- bug fixes

conform button