Added: some views changes