Few Updates on the _layouts