Updated with layout