fixed after merge

Please review UI and make corrections #771