unique id and layout fixes