Couple fixes for views with new theme