Added tags and fixed layout