Change layout
Improve code