Updated layout + more info