Added: some changes to attachment views