Changes before Checking

Did some changes for the views and other controllers.