Initial work on new tag builder layout