change layout. close #68