update and fixed layout