Fixes markup issues

Closes https://github.com/sysapps/runtime/issues/53