Fix layout
Refactor view