Added mechanism for editing layout