Fixes on markup