New header + new buttons + small corrections