Fix bugs
Improve view layout