Updated info  and layout