Fix spelling error and improve layout close #16