Corrected few bugs from views