Fix newline
Update layout
Refactor