ui changes

main and right ui wrapper changes