updated layout as discussed