update views
Merge branch 'style_todo' of https://github.com/pengan1987/videoproj into style_todo