New Changes

Changes on view controller