Feature/lvoui 56 markup

please check my commit and if it ok, merge this, `cause I made some fixes that our team need to take. thnks