UPDATED improved layout.