More fixes for the views and change tab