Markup - simplified some code for the showcase