[Dev] update layout