Started transfering markup from code