Started some changes to views