clean up
update id handling in FXComponentLayout