Small changes to View Controller