update, layout bug fix