Improve layout
Minify prod