last fix
update all views and fix thumb
fix conflicts