Fix layout. Close #2