Moving views under assets
Fixing bug in watch precedence