Final Update

changes to index and controller