Improve UI
Soy file refactoring