re-enable the active flag, by computing it properly
add the site icon to the navbar
Merge branch 'master' into live