update layout + fix
update