view fixes
changes
update handler fix
style change
Merge branch 'master' into dev