Layout update, docs, api