Made some revisions on View controllers