Clean
Improve layout