Make more changes to views files