Update template & desktop layout markup