Fixes for Activity View