Improve layout
Optimize for production