Fix layout
Add more screenshot